From b8d1e87417d86222aaad4e6c75319d1a0cc8a561 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 17 Jan 2022 02:12:08 +0000 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 514966 -> 515685 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index ea6745990ad..9c7a2dea611 100644 --- a/Repository.mk +++ b/Repository.mk @@ -855,7 +855,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ ) \ )) diff --git a/configure.ac b/configure.ac index bfe754e686f5108358a69aefc5e90ab87c9db94b..bafcbb01cdd218382589c4f941b639d05bbb5f14 100644 GIT binary patch delta 575 zcmZ9J&ubGw7>3!+w@G$M*On%Y4S}83stpuWf+#}K*n%`Yq!=rdbd$zrVz-8*baoX* zFeghdQd#izW(Dt7k;a1uLGhA{M^EBG@t}W#5XYF-9|P}UUY>crVdg>0`tr(ZzEI4f zX)w78tL5wEN@LmfpS_Hs7*Qhlw5Vv~d-X(@>XP|2zU)*TE||N*Sr0(kR*q6uN>H+u zL!rHT(^iuE^)TMpN(xp^N$&&S7nLJcS8h-I9#XjBxGSZeVDcsx_D086WK@|zt7FsE z=m4*muhe*{QMoqCMkZOkfu(i29oL;IbGdNY=-A&DWFDzWd|szCPT$f@bQZ|OF+m4m z%u^rc1RX|mEG&^s7`rZw_^U&4e01p~%5Q^F6rM<|$SH`F zN2hRaR$~2YM5uTa^J@d)WYsZr#%qEby3V}1;4aH%E@!55Q-+S6i(0h*-?Hjp%cDg6 z&qMU^nf!(9bPo6LsIf8mkN=-CGE=4e{Q3N)@g9%Ib$LPdkPd9LJ(AI6f~~d}YV)62 CG`j=< delta 208 zcmaF5M}FFN`Gzfwd~xmT;~9aN35c1uua9Sm5Si{!z@jqUZ!#0-^b2!YSf(E+V9}di zTf!nfz2^xd$MoYREXLEPMYBju7b^u4=c8GKrn{7~$V^WuWs#pQ7sDbleSRs6%H-M7 zVv`r-u}*(n3e(u=^jNap3@hBShvbp6epjG;+`&6&SE&d?INSV^z?ET z+v#h{StO^gtY+uu@Nx`ubn$oAoX%UpA~n6JkWFZMf*m`5`>YBUAZ7((w(YYj*iWYd E0M!Ob=>Px# diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 6477ad71e8c..c23343a027e 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) ifneq ($(gb_SUPPRESS_TESTS),) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 16eba69c3e3..0d5fca58d2c 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -42,8 +42,10 @@ endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ GeneratedPackage_uno_loader_classes \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index be03d40ff58..bed51e1c7a6 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2